R=joransiu@ca.ibm.com

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