TBR=gbeaty@chromium.org, hinoka@chromium.org, nodir@chromium.org, vadimsh@chromium.org

Change-Id: I22261cf724e76081c4f3ebef27e7f3a5b7fa9e38
Reviewed-on: https://chromium-review.googlesource.com/1147673Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>