R=ahaas@chromium.org

Change-Id: If0001d1b829540d76a3cef54a495322ca624d030
Reviewed-on: https://chromium-review.googlesource.com/507227Reviewed-by: Andreas Haas <ahaas@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#45373}