R=machenbach@chromium.org

Change-Id: I9adf50ef62abf310a0722160ff7997b87e1733f6
Reviewed-on: https://chromium-review.googlesource.com/664800
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48009}