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

Change-Id: I70eb2755f6d33fd6a2d26c9a3889659e9c66da22