am b09f3338: Merge "Add and use ScopedSuspendAll"

* commit 'b09f33381174843214de40533366e162a0c6d768':
  Add and use ScopedSuspendAll