Merge "msm: Add secure vmid for msa" into msm-4.8