Merge "Remove a.t.TestCase" am: 3c5ab7d324 am: 930ab689f0
am: 143f5d652c

Change-Id: I1b2212164ab566f3619cdbe307ff9ee600242424