Merge "Remove empty ScopedArray constructor." am: e7120f5056
am: 1a8fb13d2e

Change-Id: Ic7ab0ef3a691e5332fd02a5eb5cf08277fe44f5d