am 6ab920fb: am 5b741144: am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master

* commit '6ab920fb614cb7d33498ec75254df5a7fd271ed3':
  DO NOT MERGE: Fix build after checkThread fix merge to master