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