Made changes for nonroot daemons run

Change-Id: I17a83b07b6ddb24cb01bf5cb956b67f93cbee6e7