Merge "Transplant the Logging system from Telecom"
am: cbb03d1ad3

Change-Id: I216ed7c9ab32a8a21fc58ec1ee3972d5f881084a