Merge "Fix loop iteration bug." am: 1a74681173 am: db80339f95
am: c43493ffec

Change-Id: Id9b3851ef8ed4b791c3b754f0bf2d0b3b24d63c1