am 34ee8252: am a649fafb: Merge "Switch keystore to binder"

* commit '34ee8252caa1ede3b1ba41b49673c90e3a500459':
  Switch keystore to binder