am d8b555b8: Merge "Updating shutter button resources" into gb-ub-photos-carlsbad

* commit 'd8b555b801c5e57bfbeca27ef38bea7688286c3c':
  Updating shutter button resources