R=bmeurer@chromium.org Review URL: https://codereview.chromium.org/1425693006 Cr-Commit-Position: refs/heads/master@{#31712}