am 6ccd708a: am 0e406003: Merge "Fix crash/OOM in DiskBasedCache"

* commit '6ccd708adf345337137a7ef8efa6fd618afa7bc4':
  Fix crash/OOM in DiskBasedCache