am e63b9815: (-s ours) am 3b2ba81b: (-s ours) DO NOT MERGE. Remove obsolete TradeFederation from this branch.