am c7f947de: am d405f8ed: am b178c195: Merge "Updated Gallery to avoid breaking the build - API change" into gb-ub-photos-carlsbad

* commit 'c7f947de08046baeea37af6648e4a8a07baf274e':
  Updated Gallery to avoid breaking the build - API change