am ed11c140: Adding debugging and naive fix for issue 15334203

* commit 'ed11c14003ca4ae5f702b6eb3f6b5dd8f4e7d4a4':
  Adding debugging and naive fix for issue 15334203