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

Change-Id: I264d42c4c484dae65bd54256a014ca37f08d8e39