R=joransiu@ca.ibm.com

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