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

* commit 'cf44c917101d34e89e7f67899957155035055423':
  replace Thread.sleep to PollingCheck