Merge "Remove unnecessary check of multiple advertise instance count." into lmp-mr1-dev