Bug: chromium:645890
TBR=yangguo@chromium.org

Change-Id: Idd884f71278643ce40352a63f436c9072c84c6fd
Reviewed-on: https://chromium-review.googlesource.com/459556Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#44118}