Merge "Remove checkThread() from findAddress" into jb-mr1-dev