am 51afa32c: am ec30731d: am 2276398d: Merge change I0d9344aa into eclair

Merge commit '51afa32c69aca2206578f363af50753f59d19574'

* commit '51afa32c69aca2206578f363af50753f59d19574':
  Fixed