Merge "Don't return from loop" into pi-dev
am: 2c14da4001

Change-Id: I5bc172137317bd93385392f49f705932b06aed28