diff --git a/.gitattributes b/.gitattributes
index c13f46c3bdc..542f0b24424 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,3 @@
 # Do not merge this version into `stable`.	# DO NOT CHANGE THIS FILE
-snapshot_test_goldens/**/*.png filter=lfs diff=lfs merge=lfs -text	# DO NOT EDIT THE LINE BELOW.
-.gitattributes merge=gitattributes
+snapshot_test_goldens/**/*.png filter=lfs diff=lfs merge=lfs -text
+# .gitattributes merge=gitattributes
diff --git a/components/private/TextControlsPrivate/src/Shared/MDCTextControlGradientManager.m b/components/private/TextControlsPrivate/src/Shared/MDCTextControlGradientManager.m
index 098f2f870cd..ee26fbbae40 100644
--- a/components/private/TextControlsPrivate/src/Shared/MDCTextControlGradientManager.m
+++ b/components/private/TextControlsPrivate/src/Shared/MDCTextControlGradientManager.m
@@ -57,12 +57,14 @@ - (CALayer *)layerCombiningHorizontalGradient:(CAGradientLayer *)horizontalGradi
   return layer;
 }
 
-- (UIImage *)createImageWithLayer:(CALayer *)layer {
-  UIGraphicsBeginImageContext(layer.frame.size);
-  [layer renderInContext:UIGraphicsGetCurrentContext()];
-  UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
-  UIGraphicsEndImageContext();
-  return image;
+
+//Replace deprecated UIGraphicsBeginImageContext with UIGraphicsImageRenderer in createImageWithLayer
+- (UIImage *)createImageWithLayer:(CALayer *)layer{
+    UIGraphicsImageRenderer *render = [[UIGraphicsImageRenderer alloc] initWithSize:layer.frame.size];
+    UIImage *image = [render imageWithActions:^(UIGraphicsImageRendererContext *context){
+        [layer renderInContext:context.CGContext];
+    }];
+    return image;
 }
 
 - (CALayer *)createLayerWithImage:(UIImage *)image {