Merge "Migrated from Robolectric 2.2 to 3.0"