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

Change-Id: I255aa58c4c1f35cb25d7eb2ad79ca7e93972a742