Resolved issues with demo-service

Change-Id: Ied9478f4d564cf263a24ae77384c2d852ec2978a
Merge "Resolved issues with demo-service" into release-0.3