Merge "Revert "Update proguard""