Merge "Combine two versions of lookupByOffsetWithBias()" am: 1379ec4788
am: 6edd57afd9

Change-Id: I8dff9755a06457f77d32f3f237d5be5158be9158