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

Change-Id: I7cadee51aa8ce44c156b6d7fc5d0d4df3708720c