Merge "Periodically clear cache under high storage threshold"