Merge "Keystore.java: Make apps tolerant to keystore crashes"