R=joransiu@ca.ibm.com

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