Merge "Fix Robolectric tests"