Regen descriptor protobuffs to be compatible with 2.5
Merge branch 'update_25'