avoid redundant service lookup in subscribe handling

Change-Id: I5d16aebc3d40be14cdac7b73d8dd90dd26d448a2
Merge "avoid redundant service lookup in subscribe handling"