Merge "Refactor EuiccPreference"