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

Change-Id: I97ffc4619b1d1fa8d816a4c17d0afeb37d457ca8