Merge "Small fix for the key grant alias used in importKey" into pi-dev