am 65d949d7: am 458430d8: (-s ours) am 5ab9af41: am f76b5383: DO NOT MERGE Un-deprecate getDhcpInfo

* commit '65d949d7f0110aea267036a284c683a27360700c':
  DO NOT MERGE Un-deprecate getDhcpInfo