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

* commit 'efa8ae01ad897457f86c17477ea3d5a3330ba521':
  Update Gallery2 camera launchers