Merge "Fix broken gtests after SuspendCheck optimization"