R=joransiu@ca.ibm.com, jyan@ca.ibm.com, michael_dawson@ca.ibm.com, mbrandy@us.ibm.com

BUG
LOG=N

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