Port d0562944

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

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