Debugging statements to try to diagnose bug 40009

Change-Id: Icc19961fd126f6c86858f9461b65d2a5ac3aed91