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

Change-Id: Ied500b50876f67b2ab88f8f1586873eb5c6c7a2c