am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master

* commit '7c01f9f7abd9eb1aefdf712be98d57e4075422bb':
  DO NOT MERGE: Fix build after checkThread fix merge to master