Merge \\"Fix a broken case of AndroidKeyStoreProvider error logging\\" into nyc-mr1-dev am: 45b8216d33
am: 4beff1fc13

Change-Id: I0e547655e9a10572be341db50976c66ae493d021