Merge "Revert "Revert "Add monitor for ip cid change"""