Revert^4 "Drop VDM permissions from Shell"

4318cf0f1217f49451966e85c68a0541e2e35b10

Change-Id: I74fb228489912bbd301c24a85e9fa2716cb336b5
8 files changed