Merge "Remove deprecated AutomationUtils methods" into sc-dev