Merge "expose Carrier Id related APIs"