Merge "Fix NegativeArraySizeException in DiskBasedCache.streamToBytes" am: 4ad53e3321
am: 4b72784962

Change-Id: Ib2f0da064bc119b9a4a212d75e5851378768d88d