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