* commit 'd1ea67785d6b6d2c9b86f5037257d523252bf4e6': Revert "Service data and manufacturer data can be repeated fields."