Merge "Set a small chuck size for the protostream" into udc-dev