Merge "Revert "Sounds cleanup"" into honeycomb