Initial logging updates

Change-Id: I90a440f1e14d474ad632ca7436ce5f2610897761