This provides much better debugging output. Depends-On: https://review.opendev.org/702772 Change-Id: I1a738e6f951b12b54bbc2eaf61d5b01ab70a1203