Port 3f303da2

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

Review-Url: https://codereview.chromium.org/2672813002
Cr-Original-Commit-Position: refs/heads/master@{#42898}
Review-Url: https://codereview.chromium.org/2704303006
Cr-Commit-Position: refs/heads/master@{#43380}