Merge "Fix robolectric test error"