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

* commit 'f2e1249846a17c69d728189a8dc67f37261f0a59':
  Properly identify how much metadata we need to cache in order to instantiate
tree: 9155a45be80ea5db382c2a0866f63769c5138509
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/