Merge "Scenarios: remove trivial wrapper methods"