Merge "Return correct offsets for getAttributeRange()"