R=joransiu@ca.ibm.com

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