am 9a212adc: Fix 2641875 Initialize the cache path only if the container...
am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
Merge commit '9a212adc' into froyo-plus-aosp
* commit '9a212adc':
Fix 2641875