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

Change-Id: Ie37c2d03332f3f1e8c55d2244129f0ad0ec28969