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

Change-Id: I770e609b45515799020c352aa9ed4999e7989ddd