R=joransiu@ca.ibm.com

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