Merge "Convert server unit tests to robolectric" into main