Merge "Merge "Use ArraySet#add() instead of ArraySet#append()" am: 55793cc0 am: 8d07cea9 am: 9691a4a8" into sc-dev