Revert^3 "Drop VDM permissions from Shell"

0de80ea0c8a2b62aec2a433e215436b961f2619b

Change-Id: Ida5bcdf23908128ebd681f27fa874791334cae15
8 files changed