Merge "Carrier id api rename" into pi-dev