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

Change-Id: I3493057c8362733f117dbc25f654497b9f22f219