Merge "Avoid using NIO channels in addAugmentedProtoToDropbox" into main