Merge "Cosmetic changes to netd client files."