R=joransiu@ca.ibm.com

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