Merge "Use int32_t instead of off_t when necessary." am: cf6eb0a136
am: 5c38332e6b

Change-Id: I041150af148d5dda6e5abbb375d6213980521bae