Merge \\\\"Improve init Service logging.\\\\" am: c1d9ac1f85 am: b49e54b1d7 am: 3fca6fba2b
am: ef6975b675

Change-Id: Ied4a0d350c5a7647639cb465c505100f2e53eb9f