R=joransiu@ca.ibm.com

Change-Id: Ibebb8bdb064628443c7bb4093382c3e7e8c04472
Reviewed-on: https://chromium-review.googlesource.com/1236601Reviewed-by: Muntasir Mallick <mmallick@ca.ibm.com>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#56104}