Assigning to Zhipeng to make the suggested changes. As this is impacting workarounds on the CENGN build server, request is to source this in STX master and also to cherry pick to r/stx.4.0
Assigning to Zhipeng to make the suggested changes. As this is impacting workarounds on the CENGN build server, request is to source this in STX master and also to cherry pick to r/stx.4.0