Sounds cleanup

Change-Id: Ia669ea1f2efbae46290e4ea5f860cdd3671277b4
150 files changed