Merge "Remove deprecated, hidden versions of changed public APIs." into sc-dev