Merge "Fix Tests with Proguard enabled"