Merge "Merge "Use ArraySet#add() instead of ArraySet#append()" am: 55793cc0cb am: 8d07cea94a am: 9691a4a867" into sc-dev