Port ef6c175c

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

Change-Id: I045c22ac71d6ac18e10429e7ba1a7a5ef107529e
Reviewed-on: https://chromium-review.googlesource.com/755894Reviewed-by: Joran Siu <joransiu@ca.ibm.com>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#49163}