Merge "Checking in API diffs for 25.3.0" into nyc-support-25.3-dev
am: 971b96cb28

Change-Id: Icf0b17853159e365b40c62728e0d53bfc4cd1a24