am 0edc952e: am 8c815d9d: am b134b203: Merge change Id8c9cb2f into eclair

Merge commit '0edc952e290fba0309d40c54c10960c99d505e26'

* commit '0edc952e290fba0309d40c54c10960c99d505e26':