[automerger skipped] Merge "Fix iteration through a slice to account for...
[automerger skipped] Merge "Fix iteration through a slice to account for -Wsign-compare" am: b8e40cc3
am: 818b3ca0 -s ours
Change-Id: I4aaac479ae390f77e0a5ff9d837bad59a1a6e8a6