Merge commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a' into gingerbread-plus-aosp * commit 'aa1a694dc78e5201fc83fe3d710a6e43eb62831a': Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.