Merge changes Iff862198,I5c219d29

* changes:
  Keystore 2.0: Clean up lints
  Keystore 2.0: Move per-boot database out of SQLite