Merge "Fix robolectric test"