BUG=
R=jarin@chromium.org

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