R=pfeldman@chromium.org

Change-Id: I6ffa0aa357bc296a5b6fc2b20fb10e2e806dae56
Reviewed-on: https://chromium-review.googlesource.com/1175080Reviewed-by: Yang Guo <yangguo@chromium.org>
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55134}