Merge "Fixed that volume buttons were not working on the pin input" into...
Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev am: 8e2a2fa9 am: 01c59fc0
am: 13eaaea8
* commit '13eaaea8':
Fixed that volume buttons were not working on the pin input
Change-Id: I2361392d72d01413abfd7859e2a70d93cdff662a