Cherry-picked debugging on submodule civicrm

Change-Id: I7f1c466abea3687d98177498e18ef047a268cce2