Merge "Remove Protocol.BASE_* usage in Connectivity"