Merge "Fix metrics doesn't work if multiple tethering requested"