Merge changes Id48cde63,I2acbacae into nyc-support-25.2-dev am: 73adf7b803
am: f053263b4d

Change-Id: I6055551b096bf280aa1808010db94b877448c768