Merge "Port "Better workaround for Bug 1089." to vp10 (nextgenv2)." into nextgenv2