Merge "move non-root id run for CDT container"