Merge "Reduce chance of zero-length keystore files" am: 71251eec8d
am: 586a2dbf53

Change-Id: Iedd1c87c8a727b4ecb415d16a3fe14907f5206e0