Merge "Make keystore more noisy on diagnosing corrupted key blobs." am: 939ef15ed5
am: fb27742c63

Change-Id: Ie402dc09899934d85e5eece1759a11eae7301c1f