Fix service creation failure

Change-Id: I1c50b757e116ada289f0e35e1dc7a031b7529e48