Merge "Remove a.t.TestCase"
am: 3c5ab7d324

Change-Id: Id2f80c8bb95e3e64207d937929e027c49e602a72