am 0617c73f: am 308c30af: Merge "Cosmetic changes to netd client files."

* commit '0617c73f918ccfa5b836e1ae11c06a060f447469':
  Cosmetic changes to netd client files.