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

Change-Id: Ibeab08999de0480fe4dd7ca287996a9395df84e7