Merge "Pass metered information to DNS resolver" into main