am 48e50e88: Merge "Add a check for null thread before trying to suspend"

* commit '48e50e8876379d38a561096415ac43ed765f65fc':
  Add a check for null thread before trying to suspend