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