Merge "make proto change backwards compatible"

const int FIELD_ID_DIMENSION_LEAF_IN_WHAT = 4;

const int FIELD_ID_DIMENSION_LEAF_IN_CONDITION = 5;

// for ValueBucketInfo

const int FIELD_ID_VALUE_LONG = 3;

const int FIELD_ID_VALUE_DOUBLE = 7;

const int FIELD_ID_VALUE_LONG = 7;

const int FIELD_ID_VALUE_DOUBLE = 8;

const int FIELD_ID_BUCKET_NUM = 4;

const int FIELD_ID_START_BUCKET_ELAPSED_MILLIS = 5;

const int FIELD_ID_END_BUCKET_ELAPSED_MILLIS = 6;

  optional int64 end_bucket_elapsed_nanos = 2;

  optional int64 value = 3 [deprecated = true];

  oneof values {

      int64 value_long = 3;

      int64 value_long = 7;

      double value_double = 7;

      double value_double = 8;

  }

  optional int64 bucket_num = 4;