[automerger skipped] Merge "[DO NOT MERGE] Return correct offsets for getAttributeRange()" into qt-qpr1-dev am: 3e57701bbd
am: 8e0f2e9969 -s ours
am skip reason: subject contains skip directive

Change-Id: I424f38b3cf2c6fe668d828c21dee551fc041611c