am 8d060f27: am c20d7286: Merge "Replaced CHECK with EXPECT in tests."

* commit '8d060f2703359c58a7253ecb59d56244ab93ba12':
  Replaced CHECK with EXPECT in tests.