Merge "Adopt robolectric 3.6.1"