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

Change-Id: Ie426149513a2d93078b45fbae583fa06fac8982b