Merge "Fix NegativeArraySizeException in DiskBasedCache.streamToBytes"