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