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

Change-Id: I19b9a5b9b82efa4bceb4f51584417edbdbe89d52