Add debug logging for bug 46581

Change-Id: I1f132f03930c02b259ad03987aef52cc24f4a848
Merge "Add debug logging for bug 46581"