Merge "Merge "Use separate variables as indices in nested loops" into qt-dev...
Merge "Merge "Use separate variables as indices in nested loops" into qt-dev am: 2c163664 am: a67a6ec4" into qt-r1-dev-plus-aosp
am: 67e5b882
Change-Id: I7034b41d11fb4c56dbfb9e2ada10edc9ee0caf41