Merge \"Improve init Service logging.\"
am: c1d9ac1f85

Change-Id: I5eca381c0883015f1d043946db71c20635cc1784