Merge "Update proguard config to keep base Preference class" into mnc-ub-dev