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

* commit 'cc9b5ca607b75be4beb9c94a628d43d0040acdfc':
  Fix broken DiskBasedCache