am 48289b2e: am 7c12540f: Merge change Ibd2197fb into eclair

Merge commit '48289b2e892cf55bf4bdc6163f8f4f0642eed9b9' into eclair-mr2-plus-aosp

* commit '48289b2e892cf55bf4bdc6163f8f4f0642eed9b9':