Merge "Prevent system crash when adjusting volume with illegal direction" into oc-mr1-dev
am: ec0fc85a90

Change-Id: I68535fbc5a90e49e928c89fa94c2ca970bb8bf78