Merge "Revise secure key import API after review" into pi-dev