Merge "Do not inherit all permissions from shell" into rvc-dev am: f60894456a

Change-Id: Icf949e8dd873acd201bdfd47f23752a07930a2d9