Merge "make proto change backwards compatible"