am 1b0fbce9: Merge "Use keymaster 1.0 softkeymaster"

* commit '1b0fbce97776d481ea0ccfee26708d1d26755259':
  Use keymaster 1.0 softkeymaster