fix for compilation improvment on old gcc and data service development

Change-Id: I4d8bfacad22a51057c8c69a3d817dec8f6c6f95e