Merge commit '46e63b346770efa14451b8e67b7f7636c4e5a76c' into gingerbread-plus-aosp * commit '46e63b346770efa14451b8e67b7f7636c4e5a76c': Better file size estimate
Merge commit '46e63b346770efa14451b8e67b7f7636c4e5a76c' into gingerbread-plus-aosp * commit '46e63b346770efa14451b8e67b7f7636c4e5a76c': Better file size estimate