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

Merge commit '4f9a7d426b8be986947f6bf77e4ed90bf3f613e3' into eclair-mr2-plus-aosp

* commit '4f9a7d426b8be986947f6bf77e4ed90bf3f613e3':