Merge "Fix RouterAdvertisementDaemon thread leakage problem" am: 1d8977b992
am: cbb2ae04e1

Change-Id: Ib328be760394deb8682f4926a0b393b0761416fd