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

Change-Id: I954aeebe9375412cdbbbd49117b44131b33b8670