Fixed formatting, put back Object type for the value of GroupByObject

Change-Id: If4a8f505e70619503087e7556e6b4df5829539b3