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

* commit '7e1664d44be6174c772fc3d2dc8ef9f5f5824390':
  New camera sounds