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

Change-Id: I63433c19e5cdad2299f39118d063d2067c5cd6d6