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

Change-Id: Id8d701e67fdd323dd83629d3d73420536719485d