Merge "Suppress FileNotFoundException in LockSettingsService"