am f818028e: (-s ours) Merge "DO NOT MERGE Cherry-pick:Update Gallery due to...
am f818028e: (-s ours) Merge "DO NOT MERGE Cherry-pick:Update Gallery due to API change." into gb-ub-photos-carlsbad
* commit 'f818028e':
DO NOT MERGE Cherry-pick:Update Gallery due to API change.