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

* commit '2e23484eec2321537e843168f76cba4c18b56f95':
  Un-deprecate getDhcpInfo