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