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

* commit 'c20d728627c19f7d81328bed9b800a643f6ba680':
  Replaced CHECK with EXPECT in tests.