Merge "Merge remote-tracking branch '4.9/tmp-ffc9972' into HEAD"