Merge "Merge "Fix testable looper threading" into pi-dev am: 5a36c134b7" into pi-dev-plus-aosp
am: 6a308e1800

Change-Id: I33d57e7867bde221b53f6710d6c984aed58707b6