Merge "Use non-root user for Dockerfiles of nonrtric products"