Merge "Revert "Convert server unit tests to robolectric"" into main