Merge "msm: net: ecm: variable name change"