am 03de3d2a: am b09f3338: Merge "Add and use ScopedSuspendAll"

* commit '03de3d2a5e201f4563dc522d8ff84d9629211c47':
  Add and use ScopedSuspendAll