Fix for 510931, merge to m44

BUG=510931
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true

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