Merge "Migrate Dockerfile.sdk to unprivileged user" into release-3.2.0