Merge "Correct the keystore alias used for secure imports" into pi-dev