R=jkummerow@chromium.org

Bug: 
Change-Id: I2aaf7160f874985374b7b975912bf93261fdef4d
Reviewed-on: https://chromium-review.googlesource.com/737831
Commit-Queue: Georg Neis <neis@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48958}