Merge "Remove last NetworkStack usage of hidden APIs"