Merge "Add flag for enabling the ECM Service and Manager APIs." into main