Merge "Change the interface parameter from off_t to uint64_t"
am: ec4e2d2667

Change-Id: Ib75623509ca990b46bb5040fd4aeba6c5b8698c7