Resolved issue with services table

Change-Id: Ib7176510885388217e8898d62576b7adb8008707
Merge "Resolved issue with services table" into release-0.1