Merge from Perforce
Merge from Perforce
Fix the LLDP script issue