Merge "Remove DhcpInfoInternal"
tree: ec1b3c6f354918e73513a5f4352fdc57453764e2
  1. core/
  2. services/