Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev