[automerger skipped] [DO NOT MERGE] Return correct offsets for getAttributeRange() am: 013afc4daf am: 3d2b94bd5b am: e5151f8012 am: bc7cfe6370 -s ours
am skip reason: subject contains skip directive

Change-Id: I6e0398c8b93466c88fc85e0572ac8f36c3a3ce88