am 6d6f1ee3: am bcacf161: Merge "Allow optimizing and trace tests to be not run."

* commit '6d6f1ee3665e2358227b5d71aec92a68d8c4d886':
  Allow optimizing and trace tests to be not run.