Merge "Use separate variables as indices in nested loops" into qt-dev am: 2c163664ba
am: a67a6ec472

Change-Id: I9cacbf751123776e766ecb723fc9cf05df63c3b3