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

Change-Id: I8b71c9596919f3af732eff516c7da1c5dc6a09f0