Port 7a07d74b

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

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