Fixing incorrect ++it++ with ++it

Change-Id: I5981ed287ea6b4049fdf75067bdeb69c8a62a8ad
Merge "Fixing incorrect ++it++ with ++it"
Merge remote-tracking branch 'juniper/master' into review-rebased