Merge "Adopt robolectric 3.5.1"