Merge "Sounds cleanup" into honeycomb