R=sigurds@chromium.org

Change-Id: I0478c38641cfba6ccbe5ffd0ba6e50d1040e6e58
Reviewed-on: https://chromium-review.googlesource.com/1109836Reviewed-by: Sigurd Schneider <sigurds@chromium.org>
Commit-Queue: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53935}