Merge "Add checks for null in SyncManager" into froyo