[DO NOT MERGE] Return correct offsets for getAttributeRange() am: 013afc4daf am: 3d2b94bd5b

Change-Id: Id28d26d99b0e2df0a43ef6f6e8034957343271f8