Merge "Add new tests and remove unused code" into nyc-support-25.3-dev
am: 8d942a365c

Change-Id: I04852bd47927c1e6cdd4277e3b6d8d553949ed9c