BUG=661558

Change-Id: I7a4af71fafacc31aeae0c52d79641ea5e61d6b24
Reviewed-on: https://chromium-review.googlesource.com/406545
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>