Merge "When filling the cache, we always time out waiting for a condition that...

Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo