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

* commit '5a7c91769f011bc150c9def9edab9cccb4761c66':
  Fix free_cache to actually work