Merge "Merge remote-tracking branch 'origin/tmp-a25f094' into msm-4.8" into msm-4.8