Merge "Rename addPackageOverrides to putPackageOverrides." into sc-dev