am 815797fa: am dbc6d33e: Merge "Fix broken DiskBasedCache"

* commit '815797fab585958b6031093fe03ff281f953f2fa':
  Fix broken DiskBasedCache