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