am 65e4f618: Merge change I60bed5d3 into eclair

Merge commit '65e4f6188bfc8ec3c9d1c8476953cd1beb7922bc' into eclair-mr2

* commit '65e4f6188bfc8ec3c9d1c8476953cd1beb7922bc':
  Log for issue 2203561.