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

Change-Id: If0be23f0d3f6aba164a3f09c80052311d617063f