am ec83852a: am 281acf42: Merge change I52479480 into eclair

Merge commit 'ec83852a19771948ed1b6dd3af56e8439b747bf8' into eclair-mr2-plus-aosp

* commit 'ec83852a19771948ed1b6dd3af56e8439b747bf8':