Merge "Update the proguard rules again" into mnc-ub-dev