Merge "Don't drop carrier app cache unnecessarily"