BUG=None

Change-Id: Idb6863c93f639dfe4770e67710159f3e398c5238
Reviewed-on: https://chromium-review.googlesource.com/360890Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>