logging improvements

Change-Id: Ic8df6cd9f0cae83b88169fe3c8ffe62cac9b0843
release

Change-Id: Id86d37acaa9efa634e80fcb3a4549f9541899aea