R=joransiu@ca.ibm.com

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