Merge "Improve 'service' command"
am: 36b09e6a22

Change-Id: I211167ae0e2c0fd97a52c0f49ecd59c24dc15fb1