Merge "Revert "Add DhcpLeaseCallbacks"" am: 322f8e0383 am: e805c8368a

Change-Id: Ide926b738545c34b332df46ff036f2dc95f775bb