* changes:
  [automerger skipped] Merge "DO NOT MERGE: Limit the ServiceFriendlyNames" into rvc-qpr-dev am: 4de0740b -s ours am: d294e114 -s ours am: 346ad5fa -s ours am: a274175a -s ours am: 93ef7c0d -s ours am: 9814c53d -s ours am: 341bc7a7 -s ours am: 602ed494 -s ours am: 68ac9e7a -s ours am: d24f01de -s ours
  [automerger skipped] DO NOT MERGE: Limit the ServiceFriendlyNames am: de8f0fef -s ours am: c9c86978 -s ours am: 462c8eb5 -s ours am: b3a7fbe2 -s ours am: 32118f66 -s ours am: a5152f45 -s ours am: d8842d6e -s ours am: f56425a5 -s ours am: fdb6a765 -s ours am: 2788ec81 -s ours