Merge "change proto version type from int64 to int32"