Merge "Fix robolectric error"