Merge "Merge "Use separate variables as indices in nested loops" into qt-dev am: 2c163664ba am: 08b1997cbb" into qt-r1-dev-plus-aosp