Merge "Add UUID to service data and TX power to extended properties." into tm-mainline-prod