am 07e6da0b: am f81ecc1f: Merge change I29232f2a into eclair

Merge commit '07e6da0b7a342433850875b4d4d223cbb9d08d0b' into eclair-mr2-plus-aosp

* commit '07e6da0b7a342433850875b4d4d223cbb9d08d0b':