Merge from Perforce
Merge from Perforce
Fix the bug in the LLDP test cases
Fix the bugs in the report test cases