R=bradnelson@chromium.org

Change-Id: I100f33a7c0da2f86aea78cf645b7a784a920596b
Reviewed-on: https://chromium-review.googlesource.com/805241
Commit-Queue: Andreas Haas <ahaas@chromium.org>
Commit-Queue: Brad Nelson <bradnelson@chromium.org>
Reviewed-by: Brad Nelson <bradnelson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49819}