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