Merge "Fix GetMappingFromOffset"
am: 0d2f6425ed

Change-Id: Ib743d58a691dbbe517f7cb4cf3ce37f7ce70000d