[automerger skipped] Merge "[DO NOT MERGE] Return correct offsets for getAttributeRange()" into qt-dev am: acd260e11f am: a17985f08f am: 5a1363bf97 am: 1bad2fbc50 -s ours
am skip reason: subject contains skip directive

Change-Id: I9e082537d00ced773caea549c9d501608bc9c43f