Merge "Mark connectivity test utilities as module API"