DO NOT MERGE. Update 25.2 branch version. am: 31ee802f67  -s ours am: b53fa69638  -s ours
am: 12df0ca00c  -s ours

Change-Id: I2412f327da30f0784b25a933fde67683a69156e9