DO NOT MERGE: Updating 25.1.1 version to "25.1.1" and extVersion to 42
am: 28a4dd47c6  -s ours

Change-Id: I73b36ad544cf0eab44cb81c1e4608cd104f5bea1