Cherry pick 'Fix yet another convexicator issue' to M40 branch

URL of the original CL: https://codereview.chromium.org/727283003/

TBR=bsalomon@google.com
BUG=433683

Review URL: https://codereview.chromium.org/761453002
2 files changed