Merge "Update file size formatting." into mnc-dev