Merge "Migrate all tests to ActivityTest."