Merge "Add functionality to Keystore 2.0 database module."