Story: 2007236 Task: 38552 Depends-On: https://review.opendev.org/#/c/726509/ Change-Id: Icc457c15a7ff75e91707c73ce1b15f7d03af8ef9