Merge "Allow ROOT_UID to execute privileged shell cmds"