am a09dd3a6: am 7e1664d4: Merge "New camera sounds" into jb-mr1-dev

* commit 'a09dd3a6081b498476beddbbc2506f6d2be25a6b':
  New camera sounds