Merge "Fix maindexclasses use of proguard"