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

Change-Id: I0d61b4e26c9551d177b5bb7bbdaab25885976c0d