Merge "Follow ArraySet refactoring." into lmp-mr1-dev
automerge: 9c81373

* commit '9c81373bc99dd97c3e89138b008ea4c5c77c9b47':
  Follow ArraySet refactoring.