Merge "enable C++ presence samples" into connectivity-abstraction