am 43396952: am 05388e45: am 93572eef: Merge change Ifb9d6df3 into eclair

Merge commit '43396952a5b9466f18aa640f9755b6b80fa587f5'

* commit '43396952a5b9466f18aa640f9755b6b80fa587f5':
  More log for issue 2242381.