Merge changes from topic "am-5fa5a3a103ae426ea65595e6b65e044a"

* changes:
  [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
  [automerger skipped] [DO NOT MERGE] Return correct offsets for getAttributeRange() am: e6e97865f3 am: ff21f5a1d2 -s ours am skip reason: subject contains skip directive