Made changes for nonroot daemons run

Change-Id: I1c2186e2340d429a75ef3bcedb3ba73a3060fdb2