am 96d6adb1: am 2a09e92a: Merge "Make SetStateUnsafe run checkpoints before going to suspended"

* commit '96d6adb12439327d33099c24189ccff138af3c47':
  Make SetStateUnsafe run checkpoints before going to suspended