Merge "Revert "Rewrite scoped arrays with template and introduced nullable one.""
am: 9042585fa0

Change-Id: Ide0f0b5580ded28c962aa68b215abc9744d359fd