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

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