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

Change-Id: Ib493cc793f6284a70db786257838ae9586f2b8f5