Lint fixes
Fix proguard