Merge "Ensure key algorithm name of HMAC keys is preserved." into mnc-dev