R=ahaas@chromium.org

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