Merge "Fix maindexclasses use of proguard" am: f2c0f4aadf am: cde927c935
am: ba815689e1

Change-Id: I71b77d0ea54af83c60f15aac9ede151c504966f5