Merge "Fix robolectric test failure"