Merging fix for 448423 into M41

TBR=reed@chromium.org
NOTRY=1

BUG=448423

Review URL: https://codereview.chromium.org/951593002
1 file changed