Merge "Keystore 2.0: Implement clear namespace."