Merge "Fix interfaceVersion in DhcpServerCallbacks" am: e921001f2d
am: 5833474d58

Change-Id: I2f1ad63e6fa8927792cf3497a1e0b2849c5a1d46