Merge "Fixed testPrivateDnsPolicy on headless system user mode." into sc-dev