Merge "Add useful logs regarding channels and ATR"
am: 3624ed8af1

Change-Id: I6b24f6ffea277f001eb1f73941a86a7205d5d9e0