Merge "Refactor EXTRA_PACKAGE_NAME to a generic string" into sc-dev