Use logger for messaging

Change-Id: I229f5e8f9ea3c23adfc0bd9a821f103c76d776df
Merge "Use logger for messaging" into stable/4.1