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

Change-Id: I765ed8391442b9ef82f83b193fa30e7f692cb035