Merge "diag: Propagate mask info to slave processor" into msm-3.0