Merge "DO NOT MERGE: Updating 25.1.1 version to "25.1.1" and extVersion to 42" into nyc-support-25.1-dev am: b07a54e4f5  -s ours
am: d72db70c0e  -s ours

Change-Id: Ia1c1147eaff9c435e66f223fdd540fd64950985c