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

Change-Id: I8a19d9aa28ea2c9e83b357b5ef2a92ecee45b9d7