Merge "Fix iteration through a slice to account for -Wsign-compare"