Merge "expose carrier id APIs and clean up"