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

* commit '0e406003b5d434d8f16d7d6ad97d446060b788e6':
  Fix crash/OOM in DiskBasedCache