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