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

Change-Id: I2d903c074778a76529ca2ef877631e3b94b86d21