Merge commit 'd586a383685a11b41fe894d7ea5c1e9f9a4ff1b6' into eclair-mr2-plus-aosp * commit 'd586a383685a11b41fe894d7ea5c1e9f9a4ff1b6':