Merge "Migrate all tests to ActivityTest." into nyc-dev