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

Change-Id: Ie216a8b8e75a4e8e384e1390fe8cda97a64171af