Merge "Keystore 2.0: Add human readable strings to Keystore exceptions."