Merge "Fix interfaceVersion in DhcpServerCallbacks"
am: e921001f2d

Change-Id: I5e917252cc3632a823d3912094066f96597da3ae