am 8fb13085: Merge "Add suspend checks to special methods."

* commit '8fb1308578cfea07ebe6c55312821480c9cc1e80':
  Add suspend checks to special methods.