Add more logging

Change-Id: Iaca8cc7402336ab39edfaa49e2b2053b1514ed3c