R=oshima@chromium.org
BUG=637477

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