Merge "Override package private methods to make them public for tests" into nyc-support-24.1-dev
am: 5140b70793

Change-Id: Ib81b9ce8a51369266ee269c795b0d76ce4f0a528