R=hpayer@chromium.org BUG= Review URL: https://codereview.chromium.org/1261123003 Cr-Commit-Position: refs/heads/master@{#29946}
BUG=chromium:501711 LOG=N Review URL: https://codereview.chromium.org/1207453002 Cr-Commit-Position: refs/heads/master@{#29236}