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

Change-Id: I372ea1e9456a303903bb57929129cc3f922cb8d9