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