[automerger skipped] am 81d1af26: am 7922764b: am 81371b98: (-s ours) am 64e02e64: am 5a1519f8: DO NOT MERGE Un-deprecate getDhcpInfo am: 50a520b2e8 -s ours

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I11ad489025192a054b11aae6439de07e9a495b47