R=joransiu@ca.ibm.com

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