logging improvement

Change-Id: Iafbcfe7c3756af29e664221b4d62fd1a492ad6d6