Merge "Add Carriers.APN_SET_ID and NO_SET_SET" into pi-dev