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

Change-Id: I58a278b7c45afe27309cf0029e9fb8fd452b22f2