R=hablich@chromium.org

Bug: chromium:646005
Change-Id: I425111cb393d0119fa18fbe14bc32d5e7560b181
Reviewed-on: https://chromium-review.googlesource.com/667157
Commit-Queue: Michael Hablich <hablich@chromium.org>
Reviewed-by: Michael Hablich <hablich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48206}