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