R=jgruber@chromium.org

Change-Id: I07b748990f3e23cfedb0fd0cf8dce62f21a309bd
Reviewed-on: https://chromium-review.googlesource.com/631722Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47569}