Port 3a1d7335

Original commit message:
This finishes up work begun by CL (https://codereview.chromium.org/546683003/) some months ago.

R=mvstanton@chromium.org, dstence@us.ibm.com, michael_dawson@ca.ibm.com
BUG=

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

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