R=joransiu@ca.ibm.com

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