Merge "Remove the root user id to use default user"