Merge "expose carrier id APIs and cleanup"