Merge "Fix backup agent un-proguard due to package name change"