Merge "No need to specify key size when importing." into mnc-dev