TBR=bmeurer@chromium.org

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