Merge "Remove classes related to E2E testing from deviceless test classpath" into main