Port 2f559f21

R=yangguo@chromium.org, joransiu@ca.ibm.com, jyan@ca.ibm.com, michael_dawson@ca.ibm.com
BUG=

Review URL: https://codereview.chromium.org/1490923004

Cr-Commit-Position: refs/heads/master@{#32482}