Merge "Revert "Rewrite scoped arrays with template and introduced nullable one."" am: 9042585f am: a4e70243 am: 78626ad9 Change-Id: I49b37f940faba567af1487030e14dd7c33ac4a04