Merge "Fix testable looper threading" into pi-dev
am: 5a36c134b7

Change-Id: I63b58decc71d46ae35351273551174d6fb646dab