Allow service_type to be overwritten

Change-Id: I45b3a2769cfcb16d2e867ca0dcb706ce1b56aee3
Merge "Allow service_type to be overwritten"