Merge "Fix test cases for impending Robolectric merge"