am 7f9fb0c4: am 04c585e3: Merge changes Ia4825f54,If6f80560 into eclair

Merge commit '7f9fb0c4de7b9c8e9e33260d64844aad8a075609' into eclair-mr2-plus-aosp

* commit '7f9fb0c4de7b9c8e9e33260d64844aad8a075609':