am 205bdd4f: Merge "Sounds cleanup" into honeycomb

* commit '205bdd4f8951d4af9cfaeb8fb4ad9d0f1cad1afc':
  Sounds cleanup