Merge "Cherrypick change to skia"