am 7f36d421: am 5a7c9176: Merge "Fix free_cache to actually work" into ics-mr1

* commit '7f36d4217269e79f8409c46f12f10464a1f585ea':
  Fix free_cache to actually work