Merge "Even more debug for bug 17721767." into lmp-mr1-dev
automerge: dbabf37

* commit 'dbabf37fd3a6b70be5cf9639f11656e12601154d':
  Even more debug for bug 17721767.