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

Change-Id: Ia92a95ff3b88e742a0d2f19b801b24732714ebbb