Merge "Improve debug logging for bug 77342775." into pi-dev
am: 7b91439f21

Change-Id: I60c299025abec3463bdd60758d013e275f16572f