Merge "Remove usage of hidden NetworkUtils from Formatter"