Merge "Revert "Remove empty ScopedArray constructor."" am: f6a0a7491b
am: 73fce7397e

Change-Id: I8bb88e7b91928ae8fc79233a74fe545aa3d40bb7