Merge commit '59778b3c19c52aed840ec2350b12f73cc05b92af' into eclair-mr2-plus-aosp * commit '59778b3c19c52aed840ec2350b12f73cc05b92af':