am 37da3f0d: am 7bd28de5: Merge "Remove some crufty "core" tests."

* commit '37da3f0d28815a5dfbea929fc173d89cb62bd318':
  Remove some crufty "core" tests.