am bb196a1b: am 1b0fbce9: Merge "Use keymaster 1.0 softkeymaster"

* commit 'bb196a1bdb1f7f06e8a77c8285dec49ef49eeae8':
  Use keymaster 1.0 softkeymaster