BUG=
R=danno@chromium.org, mbrandy@us.ibm.com

Review URL: https://codereview.chromium.org/1245023003

Cr-Commit-Position: refs/heads/master@{#29876}