Add more logging

Change-Id: Id82d7c7569e37143a0413a90b54331452c8b2502