am 5a2772e2: Merge "Fix code problem in writePidDns"

* commit '5a2772e23b1dd2fb3840c10d4575bb06bb6f0026':
  Fix code problem in writePidDns
tree: 5289ce62c1a052a451701d523518fe2b57b0895d
  1. core/
  2. services/