Update composite to support invalid service name

Change-Id: I7d4ea29c8ac09dd0c5cc65aa9e3a523b798ee538
Merge "Update composite to support invalid service name"