Merge "Avoid creating Caches instance with gfxinfo dump" into lmp-mr1-dev