Add debugging for bug 69830

Change-Id: Ia20458cd604e230aa608294fc46b0ab6416c0b10
Merge "Add debugging for bug 69830"