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

Change-Id: Ic7e7e1929f9ef78389ae0dcf4f77efbac41a1652