R=joransiu@ca.ibm.com

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