am 80639875: am d4c5478a: Merge "Be conservative in estimating the file size...
am 80639875: am d4c5478a: Merge "Be conservative in estimating the file size limit." into gingerbread
* commit '80639875':
Be conservative in estimating the file size limit.