Only one logger for all messages

Change-Id: I3184b6945bb61a28e06dfd91b47fdf931a3d194b
Merge "Only one logger for all messages"