Merge "adbd: strip nulls from all service strings." am: 79f304771c
am: a480af956c

Change-Id: Ie8814aed51efa7833df28cb59713f9c855f3dd58