am f01ed0d2: Merge "add more PollingCheck" into jb-dev

* commit 'f01ed0d23ca0457078f2ae645e09d40d0c3e4f6c':
  add more PollingCheck