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

Change-Id: I5c5aa6cc0fb215c6182d619b461194e28319c9f5