Merge commit '2d6d609c9ede7ed8924001df00af9c13effab8ad' into eclair-mr2-plus-aosp * commit '2d6d609c9ede7ed8924001df00af9c13effab8ad': Squashed commit of the following:
Merge commit '2d6d609c9ede7ed8924001df00af9c13effab8ad' into eclair-mr2-plus-aosp * commit '2d6d609c9ede7ed8924001df00af9c13effab8ad': Squashed commit of the following: