Merge "DM: this must have been missing from the previous CL" into master-skia

https://skia.googlesource.com/skia/+/fc57a3375eef897384a55fd85e95ba4394fbf67b

Change-Id: Ic2b3d47d17188717dc1ac9b7ec07bb803970f3a9