Avoid sharing containers to prevent problems (#14200)

Change-Id: Ifc3286fce10dd4e64fd1001b786599fe66c89077