am a38592ae: Merge "Follow ArraySet refactoring." into lmp-mr1-dev automerge: 9c81373 automerge: 817722b

* commit 'a38592ae5d0cd6ed6d2a8c105d4d26475d4b7a07':
  Follow ArraySet refactoring.