am eb329bf2: am 8bd04b20: Merge change Iea48361d into eclair

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

* commit 'eb329bf2c2ced7224a37b0a84652a0933ee64736':