Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev
am: 8e2a2fa98c

* commit '8e2a2fa98c9ca077681acf13abfb6252c3859e0f':
  Fixed that volume buttons were not working on the pin input

Change-Id: I6deb8c3a706c69bebeb29f46aab10c32f8f705af