R=machenbach@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/1459823002 Cr-Commit-Position: refs/heads/master@{#32105}