Merge "Follow ArraySet refactoring." into lmp-mr1-dev