Merge changes Iaea05e59,If5acb7d0 into nyc-support-25.2-dev
am: 5b961361f3

Change-Id: Iee791737e5c342b36072627a7cec97666d2ba888