Cherry-pick !1313 to fix staging test failures
This MR fixes the current targetstaging test failures by cherry-picking !1313 (merged) onto staging
.
This MR fixes the current targetstaging test failures by cherry-picking !1313 (merged) onto staging
.