Merge "Fix issue 3007862" into gingerbread
tree: 47297fe1e1836ec590750ac34527ea8670d9e289
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/