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

Change-Id: Iab4c640caa3452f358abeb763d7b0e7da043309d