Merge commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7' into gingerbread-plus-aosp * commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7': Squashed commit of the following:
Merge commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7' into gingerbread-plus-aosp * commit '3a9cc8cef49165d6b1a1eb37b15a0ae21b0042f7': Squashed commit of the following: