am 36449a1e: Merge change Ic2680af0 into eclair

Merge commit '36449a1e14b91a25ae6b3746cb8b1387d2b8157b' into eclair-mr2

* commit '36449a1e14b91a25ae6b3746cb8b1387d2b8157b':
  Cleanup for coverage.