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

Change-Id: I8934fb865dfcc8d7a9a64be54e3e261ca3648f46