Merge "crypto: msm: Reset encr_cfg before auth operation"