Merge "DO NOT MERGE: Limit the ServiceFriendlyNames" into rvc-dev