Merge "Fix ambiguous naming and typo" into gb-ub-photos-carlsbad
tree: 171c769b88adbdce5dac1f21939e5d35bcac8c7a
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/
  5. tests_camera/