Merge "Cleanup a.t.TestGrouping" am: 01dcf54e9a
am: e6ac3a4efc

Change-Id: Id41ba23de38e5131460cad283fd5d7bea66d2156