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

* commit 'c5eb3c52409a494fac69f8280c3143228b72f863':
  Fix broken gtests after SuspendCheck optimization