Applied https://github.com/blundell/robolectric/commit/eb9b9385b52530e5278ac68b67a7a180bcbd142a