Merge "Keystore 2.0: Clear Uid/Namesapce"