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