DO NOT MERGE DHCP changes from master

Pick dhcp changes from master for the renewal fixes

Bug: 3344732
Change-Id: I42596513f3ef936ef7160d954e3bd26bc51662c8
1 file changed