Fixes duplicate service name.

Closes-Bug: #1259427

Change-Id: I66be820bea53e6338e5c828f7f8fe25b72e0c302
backport: havana
Continuing to redirect old content to newer matches

Change-Id: I925bd796de85dfe69fc987826a02b11c0c58f39a
Partial-fix: 1191447
Merge "Fixes duplicate service name."