Merge "Enable service name aware testing for allocator."
am: fcc43d5cd0

Change-Id: Ib2e2036c391a046839505a4a1c7d0ece5e014056