More logging improvements

Change-Id: I023c8270647a63d1528aa86120fd4b14712ce345
6 files changed