[automerger skipped] [DO NOT MERGE] Return correct offsets for getAttributeRange() am: e6e97865f3
am: ff21f5a1d2 -s ours
am skip reason: subject contains skip directive

Change-Id: I137837047083cd7747bbc875f83fd175dce6cd77