R=ahaas@chromium.org

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