am f3f1a370: Merge "Un-deprecate getDhcpInfo" into klp-dev

* commit 'f3f1a3709306454c0ca562e2c7262d4889dd0071':
  Un-deprecate getDhcpInfo