Merge "Remove metered vs unmetered network checks"