Merge change 8188

* changes:
  Enforce app cache maximum size