The change is present in mainline and was missing in staging [ROCm/rdc commit: 69be6f1c16]
69be6f1c16