R=machenbach@chromium.org

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