Merge "Account for early exit loop."
am: b85fd6fd73

Change-Id: Ib94d9fa5131d8663b9839045c5134faeb743dbf2