Merge "Fixed wrong loop variable (AKA: I, Y U NO J?)" into nyc-dev am: 4d33455c4f am: 705f27ecec
am: 36dedf2f2c

* commit '36dedf2f2cfde2aa08bb25ddcb93fd1f423db787':

Change-Id: Iebff623e5709d8069c7b44b70f03971afce6b525