Merge "Merge remote-tracking branch '4.9/tmp-bae751b' into msm-4.9" into msm-4.9