Add AUTOGROUP

Change-Id: I0eb47582df1ef930cc3fbad2b4c9bbf3deddbbba