Merge "Fix GetMappingFromOffset" am: 0d2f6425ed
am: 9e068aa334

Change-Id: Ia6721f3433f160b526be584f31f19bafab9ace52