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

Change-Id: Ibf5a0d12300a304f22cef08bf21776dbc89b61ca