Fixes duplicate service name.

Closes-Bug: #1259427

Change-Id: I66be820bea53e6338e5c828f7f8fe25b72e0c302
backport: havana
Merge "Fixes duplicate service name."