Squashed commits of faux123 sound control

Thanks @faux123

Change-Id: I35243a63d074ed5bb1ed824dd3e254e77c54baf6