Merge "Update for SDC Onboarding container"