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

Change-Id: I54234cdc1e9b4f610a1a11f72804cef4bd6f8489