R=joransiu@ca.ibm.com

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