Merge "Revert "The Chip-set information should be added in the list""