R=joransiu@ca.ibm.com

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