Merge "Run unit test with the prod flag java lib" into main