R=adamk@chromium.org,bmeurer@chromium.org,littledan@chromium.org,rossberg@chromium.org

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