Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev