[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 202412#961

Merged

mssonicbld merged 2 commits intoAzure:202412from

mssonicbld:sonicbld/202412-merge

Apr 11, 2025

Commits on Mar 31, 2025

Update cisco-8000.ini (#22176)
Aravind-Subbaroyan
authored

Commits on Apr 1, 2025

Merge branch '202411' of https://github.com/sonic-net/sonic-buildimage into 202412
mssonicbld
committed