Merge "Only print out services if they did something." into pi-dev am: 3c0f0b3e8b
am: f2e9567dbf

Change-Id: Ic537fd85096f9fc410ff2ba9bcfcdea736121470