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

Change-Id: I08cc393698e0a8be1e12cf360d04f7d58bb7bcc6