Add support for supplying custom service type.

Change-Id: I1fc317b7235b54ceea0228dfd71b933f8bbb8855