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