Merge commit '2002f37cd072acd801eb3f849eb2783ab11784bb' into eclair-mr2-plus-aosp * commit '2002f37cd072acd801eb3f849eb2783ab11784bb':