am b068ae14: am e2b9bb45: Merge "No runtime exceptions during normal use of...
am b068ae14: am e2b9bb45: Merge "No runtime exceptions during normal use of AndroidKeyStore crypto."
* commit 'b068ae14':
No runtime exceptions during normal use of AndroidKeyStore crypto.