Merge "Fixes support lib breakage, part of a multi-part commit to move allowGeneratedReplies" into nyc-dev