R=littledan@chromium.org, marja@chromium.org, vogelheim@chromium.org
NOTRY=true

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