am 4460df7c: am efa8ae01: am 1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad

* commit '4460df7c2bd4007ae658cd1a4a367c0bddca5c1f':
  Update Gallery2 camera launchers