This will land with https://chromereviews.googleplex.com/202967013

R=akuegel@chromium.org, machenbach@chromium.org
BUG=471767
NOTRY=true
LOG=N

Review URL: https://codereview.chromium.org/1161873004

Cr-Commit-Position: refs/heads/master@{#28684}

R=machenbach@chromium.org

Review URL: https://codereview.chromium.org/1034153003

Cr-Commit-Position: refs/heads/master@{#27487}