Merge "Merge "Use separate variables as indices in nested loops" into qt-dev...
Merge "Merge "Use separate variables as indices in nested loops" into qt-dev am: 2c163664 am: 08b1997c" into qt-r1-dev-plus-aosp
am: 225b5221
Change-Id: Id1db0e328957e87a34fad2653b202376b3b6860e