Merge "Fix issue #28156248: Receiving connectivity receiver..." into nyc-dev