Merge "Disable sounds on menu button" into oc-dev
am: 5c8832a983

Change-Id: I16aef7e38de6a154d051f539b9fc8c96db73958a