BUG=
R=clemensh@chromium.org,verwaest@chromium.org

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