R=ahaas@chromium.org

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