Merge "Fix SettingsDumpServiceTest" into udc-dev