R=machenbach@chromium.org

Change-Id: Ia50f6e637aec58e9c1bdd726c84b296fd71d7cbb
Reviewed-on: https://chromium-review.googlesource.com/1142767Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54571}