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

Change-Id: I84b68a7caa793c776140cdd2bd79b5b76c63ddd3