R=herhut@chromium.org

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