debug logging to diagnose FR #1267

Change-Id: I0d0940a5e83769affd618b9c6ec13bb8c07888ac
Merge "debug logging to diagnose FR #1267"