Merge "msm: add support for new A2 SMSM bits" into msm-3.0