Merge "Add addService to pass in allowIsolated flag."