Merge "Keystore 2.0 SPI Small doc comment fixup."