Merge "ServiceManagement: remove logspam" am: a749556b39 am: 8eee34430e
am: 9e568b14bc

Change-Id: I9824ef704f0923fdeb377708eee671571141318a