Merge "Revert^2 "Add shims for NetworkRequest""