Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp * commit '4b1bdc0209650436ebe0dad1020080cc891e97b6': DO NOT MERGE Fixing Connectivity
Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp * commit '4b1bdc0209650436ebe0dad1020080cc891e97b6': DO NOT MERGE Fixing Connectivity