am 5196cb6f: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '5196cb6fa097e856d10671bc545776b13102770b':
  trigger kernel blocked stack trace on system server watchdog