improve logging

Change-Id: Ifecf699a3539183908b361f259e8305e5180b410