Merge "Fix leak of DhcpServer on tethering stop error" am: 7e5a5a6983 am: 7afb36786c
am: fe1ad3d0b8

Change-Id: I11ca57c024b3bf8fc6788726e376ce6664798bcd