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

* commit 'f818028e5c78d85bdacd06a6161543d13b42da45':
  DO NOT MERGE Cherry-pick:Update Gallery due to API change.