Merge "Fix a broken case of AndroidKeyStoreProvider error logging" into nyc-mr1-dev