R=jyan@ca.ibm.com

Change-Id: Ib60ccc5f78af73afe3212c480aa2bd82f38d2678
Reviewed-on: https://chromium-review.googlesource.com/1255543Reviewed-by: Junliang Yan <jyan@ca.ibm.com>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#56327}