Make logging consistent with the rest of the app

Change-Id: 2b75af3195