Made changes for nonroot daemons run

Change-Id: I572caa53460fdd65ba1a53f07890836d025bb82b