Port 776d6e9d

R=rossberg@chromium.org, joransiu@ca.ibm.com, michael_dawson@ca.ibm.com, jbarboza@ca.ibm.com
BUG=
LOG=N

Change-Id: I62e59ba70fac2627a5ee00fd3007766c7c570ba3
Reviewed-on: https://chromium-review.googlesource.com/742694Reviewed-by: Ben Titzer <titzer@chromium.org>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#49038}