Merge "Clean up ArraySlice<>." am: aebfd208a5
am: 6fdf837e8a

Change-Id: I54ad4ab9e9e9543751df1d070459cd64adead144