am 93572eef: Merge change Ifb9d6df3 into eclair

Merge commit '93572eef41f94f023037482f194db0ab07d0c33a' into eclair-mr2

* commit '93572eef41f94f023037482f194db0ab07d0c33a':
  More log for issue 2242381.