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