Bug: 
Change-Id: I4577db5ae6b9623815969deb03b311bd3b550d75
Reviewed-on: https://chromium-review.googlesource.com/787310Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49602}