Merge "Fix NPE by pressing Volume Up/Down"
am: fca5ee0bb8

Change-Id: I2f35ed23478b10339a9924593411e02da77207ec