am 4336b97f: Merge "Fix broken gtests after SuspendCheck optimization"

* commit '4336b97fc291d28f883607c88feaff202a684a59':
  Fix broken gtests after SuspendCheck optimization