Merge "diag: Update Slave processor with mask info" into msm-3.0