Fixes failing API tests for create service

Change-Id: I56f5dd8c1e6b6ddc32c419fd2db2bb409217eab2
Closes-Bug: 1389790
Merge "Fixes failing API tests for create service"