am f2e12498: Merge "Properly identify how much metadata we need to cache in...
am f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
* commit 'f2e12498':
Properly identify how much metadata we need to cache in order to instantiate