Port 7745c73a

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

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