port 78b1585f

R=danno@chromium.org, joransiu@ca.ibm.com, michael_dawson@ca.ibm.com, mbrandy@us.ibm.com
BUG=

Review-Url: https://codereview.chromium.org/1993273002
Cr-Commit-Position: refs/heads/master@{#36376}