Merge "Add caching override info into dumpsys" into sc-dev