Merge "DO NOT MERGE Fixing Connectivity" into gingerbread