R=jarin@chromium.org,bmeurer@chromium.org

Bug: 
Change-Id: I6f4e56f37987d2ae67eed91401b10dcc26397970
Reviewed-on: https://chromium-review.googlesource.com/558086Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
Commit-Queue: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46404}