am dfd03fe9: am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up." into gingerbread

Merge commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c'

* commit 'dfd03fe99336792b6dae6c4c9fd5f5ba157e054c':
  Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.