Merge "Fixes bug 2502132, and masks bug 2518313."
tree: 32d0d062e12bfdbaa8a6b53709f527436255802d
  1. camera/
  2. cmds/
  3. include/
  4. media/