[automerger skipped] am 8070ffcc: am 319323d7: am 8fbc8797: (-s ours) am 202965ca: am 5b41b261: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo am: 5d772b6f98 -s ours

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I7bc5be202cdabc96f36b3f9f19bd8dc9e5229073