Merged PR 7915643: Fix the conflict of sonic-net#14371

Related work items: sonic-net#9216, sonic-net#11437, sonic-net#13507, sonic-net#13512, sonic-net#13567, sonic-net#13972, sonic-net#14351, sonic-net#14371, sonic-net#14375, sonic-net#14401, sonic-net#14407, sonic-net#14408, sonic-net#14427, sonic-net#14428, sonic-net#14439