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

Change-Id: Id102118009e17dbe4c2b7f71cc0960c15fc11a96