R=petermarshall@chromium.org

Change-Id: If181ed625015105f8bbabf29a9db3cfcf090b80a
Reviewed-on: https://chromium-review.googlesource.com/574235Reviewed-by: Peter Marshall <petermarshall@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#46709}