am da75a283: am 205bdd4f: Merge "Sounds cleanup" into honeycomb

* commit 'da75a28304a026634e6583735e525c13a2040239':
  Sounds cleanup