Merge "Fix robolectric tests"