Merge "Improve 'service' command" am: 36b09e6a22 am: 993dae7ef5
am: 774343bcde

Change-Id: Ifd948cdb1123d0b6bea096202ef44e7e0c327af6