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

Change-Id: I9604831bd21545403da2e701a47232c526acb321