Merge "Enable service name aware testing for allocator."