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

Change-Id: I41ba36d4b19840ea41bc24cf6ab77f964e2587e5