R=mmoss@chromium.org, dpranke@chromium.org, phajdan.jr@chromium.org

Bug:
Change-Id: I0bfe0c38f3b1bfa5c8bd40747a0c3483d823cbdc
Reviewed-on: https://chromium-review.googlesource.com/660722Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@chromium.org>