R=herhut@chromium.org

Change-Id: I052aee6778e96feeac5610c52b34b65d26de4dcb
Reviewed-on: https://chromium-review.googlesource.com/1112000Reviewed-by: Stephan Herhut <herhut@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53991}