Merge "Merge remote-tracking branch '4.9/tmp-7d01cc5' into 4.9"