Merge "Align SETTINGS_PACKAGE_NAME reference to a single place"