Merge changes I3009e1d1,I0b38de24 into nyc-support-24.1-dev
am: 0940b0810d

Change-Id: I439db688c05a038d867b03a3dec22361251ea95f