Include prefix in logging messages

Change-Id: I5a0f28939d38c81bd5245091cd8495fcc4b335a2
Merge "Include prefix in logging messages"