Merge "Use getCompressedSizeLong to get correct size for 2G file" am: ee1720cffa am: d3ffd42b19
am: 886c64d1e3

Change-Id: I52375b4646d392fb4877a454667897ee43a62bce