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

Change-Id: Ic5ca4d43d489d69e8bb9d41c71804176c755e691