Add extra debug logging

Bug: 279257833
Bug: 284738852
Test: adb logcat
Change-Id: I012e86f76386ac8fdccf31029f70fa39e4ffb4a8
3 files changed