R=joransiu@ca.ibm.com

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