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

Change-Id: Idf3497ce71c0a03ed440bb35c09f5247a977f6ba