Merge "Correct the keystore alias used for secure imports"
am: fcb597e1f5

Change-Id: I87d56d219e9588ee29ccde257a268a3e901cbec0