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

* commit '817722bb36e81ef0216fd1c75a9174e08238f954':
  Follow ArraySet refactoring.