Merge "Replace InterfaceParams with ifName in DhcpServer" am: 9d5e00321f
am: fce422d811

Change-Id: Iaf8dd7a21156aba248d33d095c169c0f62d8eebe