am c18d8696: am 4f9a7d42: am e9296876: Merge change Ib7c34cec into eclair

Merge commit 'c18d869629783cf37f07632ece17d27d6d10dd9e'

* commit 'c18d869629783cf37f07632ece17d27d6d10dd9e':