R=hinoka@chromium.org

Bug:
Change-Id: I027ac560beeea2ebf38fe6ddcb4e707efd3f615a
Reviewed-on: https://chromium-review.googlesource.com/538612Reviewed-by: Ryan Tseng <hinoka@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Rico Wind <ricow@chromium.org>