Bug: 
Change-Id: I4fbdb402ecc0403edafaba8ae910e28f3808d3f8
Reviewed-on: https://chromium-review.googlesource.com/497470
Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#45131}