R=jyan@ca.ibm.com, joransiu@ca.ibm.com,

BUG=

Review-Url: https://codereview.chromium.org/2588163002
Cr-Commit-Position: refs/heads/master@{#41829}