Merge "add version in carrier id proto"