Merge "Revert "Revert "Service data and manufacturer data can be repeated fields.""" into lmp-dev