Merge "Fixing the failing Robolectric build"