CBLT-82:  more debug info

Change-Id: I924c379138cf0d268b2a2b47f54a04694c36bf26