Merge "Rewrite scoped arrays with template and introduced nullable one."
am: 3204e23c06

Change-Id: I4a5b48eb8ce58b6bc54f5a51ff4b28328b7dc1b6