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