Merge "Better file size estimate" into gingerbread