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

Change-Id: I76a3469438656d9c3e99c45ae28c4179cdb609b7