Merge "Remove DhcpInfoInternal" am: 2be645a342

Original change: undetermined

Change-Id: I5146d6392f0ab9f64b4b12d90f64ace6b6bee47d