Merge "Remove incorrect iterator increment" am: a341377bd5 am: 9cc29ef968
am: 42f7bd429c

* commit '42f7bd429c37ca391092f9d0d33e2f9fca88119f':