am a8b23f2: Refactor expandInstanceRangeLocked

Merge commit 'a8b23f2b386e3e0be20ef06522292314de8cbc78'

* commit 'a8b23f2b386e3e0be20ef06522292314de8cbc78':
  Refactor expandInstanceRangeLocked