Merge "Actually make CARRIER_PRESENCE accessible (for master)"