Merge "Remove KeyStoreParameter.getContext()." into mnc-dev