Merge "Disable run-tests causing occasional timeouts with CC."
am: 0f27b87957

* commit '0f27b87957cbe18e67adb7158aa34057ef76de13':
  Disable run-tests causing occasional timeouts with CC.