Merge "Move ZoneGetter into SettingsLib" into mnc-dev