Merge "Correct the keystore alias used for secure imports" into pi-dev
am: 143c65d520

Change-Id: I100df017d1a6ad28cea2c6d78b1b0c55230897b3