Merge "Expose e.getMessage() from the exceptions in RecoverableKeyStore" into pi-dev