Merge "Changes to connectivity locking and sync holds" into froyo