Merge "Revert "netd: reduce privileges""