Make logging more consistent

Change-Id: Ifedb1ddbd7663900438fd89f2eabb3c1f4c2a5aa
Merge "Make logging more consistent"