Merge "Revert "Add shims for NetworkRequest""