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

* commit 'ef36255f876aa1a61dcf5e879f4380887dda3854':
  Revert "Sounds cleanup"