Merge "Fix ProGuard error."