logging updates

Change-Id: I530407ceb91352debf2af14d786e1a0ef0fa9add