[DO NOT MERGE] Return correct offsets for getAttributeRange() am: 013afc4d am: 3d2b94bd am: e5151f80 Change-Id: I3e0217a9954b8b134431682657d90f06408388b0