DO NOT MERGE 25.1.1 is now 25.2.0
am: 4f46fb8853  -s ours

Change-Id: I5eaefdaf3a2c729dff7ec5ba2073d2b148d16329