Merge "Change service data and manufacturer data to be repeated." into lmp-dev