Merge "Changed utils tests to support Robolectric" into main