Bug: 
Change-Id: I8df2791c1cd985023b3281d0a5179beb2328ecfb
Reviewed-on: https://chromium-review.googlesource.com/780361
Commit-Queue: Jared Saul <jsaul@google.com>
Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#518330}