R=mstarzinger@chromium.org

Bug: 
Change-Id: Ica169da6e095abb79967687ae9a18db5c833f72e
Reviewed-on: https://chromium-review.googlesource.com/546356Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Commit-Queue: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46203}