R=joransiu@ca.ibm.com

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