Merge "Modifications for changes to SettingsLib" into mnc-dev