am 088b8e65: Merge "replace Thread.sleep to PollingCheck" into jb-dev

* commit '088b8e65fec26fbd0a2643835c445b7288331aee':
  replace Thread.sleep to PollingCheck