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

Change-Id: I79e6b2de4bf523036ed1d15debd142a1786249c5