R=joransiu@ca.ibm.com

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