Merge "SDNC DGs updated for nni usecase"