Replace traditional for-loops with enhanced for

Easier to read. Cosmetic changes.
No-functional change commit.

However, made one inner enhanced for-loop into a traditional
for-loop for performance reasons - to avoid the creation of
iterator.

Test: build

Change-Id: I3a0759f36c3cd33fdc74d23f17d0749e90de2b3b