R=eholk@chromium.org

Bug: 
Change-Id: Ia099cf085510da50a87b9f999020d6a66d6eab20
Reviewed-on: https://chromium-review.googlesource.com/838250
Commit-Queue: Brad Nelson <bradnelson@chromium.org>
Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Reviewed-by: Eric Holk <eholk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#50300}