Merge "Fix maindexclasses use of proguard"
am: f2c0f4aadf

Change-Id: Ib4a65506c701fb707c669dd2116348bde6913aa7