Merge "Updates to file sizes for use cases" into staging