Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev