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

Change-Id: I4593b8f6b7503391b41c4894298872fbe71f7fee