Merge "Fix proguard rules for Mockito"