Merge "Change KeyChain to assume PEM encoded keystore entries"