Merge "Add missing checkThread"
am: fdb8dfdadf

Change-Id: Iabcd28a4c3fa659c92b392573158dd5025ed8c37