Merge "[DO NOT MERGE] Return correct offsets for getAttributeRange()" into qt-dev am: acd260e11f am: a17985f08f am: 5a1363bf97

Change-Id: I52638a72d1088039df8c2154004d751630f27d6d