R=franzih@chromium.org

Change-Id: I5f5ac245408c76a072f5cb3ae81b8773ddcd47cc
Reviewed-on: https://chromium-review.googlesource.com/808784Reviewed-by: Franziska Hinkelmann <franzih@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49912}