Port ce1fe78d

R=mvstanton@chromium.org, joransiu@ca.ibm.com, jyan@ca.ibm.com, michael_dawson@ca.ibm.com, bjaideep@ca.ibm.com
BUG=chromium:585041
LOG=N

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

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