BUG=chromium:645890

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