Merge "fix ethernet and wifi can't be tuned seperately issue"