Updated logging

Change-Id: I58709b64ad914581050335da07584169ad5c5016