Merge "Remove most sounds" into pi-dev am: f67a491e44
am: 99837d59ea

Change-Id: I8eed1b6cb93f6808df867310c3c98c45c4ab3f6e