Merge of 1160633002 to m44

BUG=502331

Committed: https://skia.googlesource.com/skia/+/7a9c45c01cadea5d8b3e9671a57311247a8c414d
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true

Review URL: https://codereview.chromium.org/1219483002
4 files changed