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

* commit '308c30af72da7b13938934ba5037dd347b1ef139':
  Cosmetic changes to netd client files.