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

Change-Id: Ie9b3a6882975af0ef844c245a9ed984071c335a6