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

Change-Id: I80205eb37ad4c2886d8174f110ca204be947d5cf