Merge commit '106f9b244633171ab75dd98b9761b7137c1a4705' into eclair-mr2-plus-aosp * commit '106f9b244633171ab75dd98b9761b7137c1a4705': Patch from Huahui Wu.