Merge "Exit the loop at the right time" into pi-dev am: 6d24a1c8be
am: b9af84ca8d

Change-Id: Ib9b12c8e7f2f832e28f19302278ed2685918a51e