Fix service_type bug

Change-Id: Ie22097e2a30acb747ca6c4704f2eeab67c0fb3c7
Improve breadcrumbs

Change-Id: I854b6c44056679b8fed2b165198c695fae977a99
Merge "Fix service_type bug"