Merge "Fix compatibility with Robolectric."