Merge "Fix to issue with routing table update for offhost AID."