Merge "a new folder to store OTA carrier id update"