Merge "KeyStore: minor improvements."