am dd8e315b: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo

* commit 'dd8e315b86614627eb8ba629c713d73034fed357':
  DO NOT MERGE Un-deprecate getDhcpInfo