Merge "Keystore 2.0: Fix TODOs in public doc comments."