am 197ef85e: am e5608f5e: Merge change Ied958262 into eclair

Merge commit '197ef85ef5c8563270a38808d2716a29e12e00e9' into eclair-mr2-plus-aosp

* commit '197ef85ef5c8563270a38808d2716a29e12e00e9':