am 8978547f: am f5fe3949: Fix issue 2459650.

Merge commit '8978547f254b6b6ba2e322794aa044803f3edc2a'

* commit '8978547f254b6b6ba2e322794aa044803f3edc2a':
  Fix issue 2459650.
tree: be9ebdaa43f50e02295a6cf71e1d3b3e43fdead0
  1. camera/
  2. cmds/
  3. include/
  4. media/