Merge "servicemanager: lookup service labels using "service" backend" am: 9ada1719ba
am: dcf4a67e94

Change-Id: I0da7cd055980b1cc064220b836613852df6bf396