Merge "Require @Scenario annotation on platinum tests"