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

Change-Id: I084b0b5251a0dbc8ebb142a51380ee43a4d15a1c