Merge "Use new AccessNetwork type in the reporting criteria API"