Merge "Cherry-pick of 092fd92 to fix bug 7344730 also." into gb-ub-photos-arches
tree: bdc2607781da2e8640554eaf574b75bde939d7f9
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/