am b7fa0b65: am ef36255f: Merge "Revert "Sounds cleanup"" into honeycomb

* commit 'b7fa0b65d789464f67b00d5975a9bc26460ce63c':
  Revert "Sounds cleanup"