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